US05-SQ-02

Updated code for US05 according code review notes