- redone "if statement" handling

I have tested it with many scenarios but please have a look at it before "blindly accepting" it.