if/else structure is better now