rework user story with some new design ideas