WHILE and COMP added