Got rid of the pesky while loop (unneeded)
Updated