more if-else work