removed all if