s04-us54: implementation completed + test case + awaiting code review