Fixed all the Remaining Issues mention in the last comment!