201505 reworked my solution