added support for while loops and removing conditions