removes AddIf
adds comments