Update hw05 to comply with spec