Luoy6 Resubmit working one

Updated code, now it passes the testor.