Reorganizing
While loops; Fixing GT/E