More Issues 2 Address (Explicit)

Addressing All Issues 2 (Explicit)