Enabled and Fixed #2 | Added #1