-Corrected some logic (else)