updated 'if''s again