First version ready (if/else solution)