reeanebled all if statements