If Statement added
Improved lots of stuff