added code for if-conversion