Changed some if-conditions...