'if' updates

in progress...