Added some while loops!