Story 6 implemented