Revert "#1 and #3 Fixed"

This reverts commit c1c2ec996d97b58acb5fd639302ee3a2c1ae187b.