refactored existing stories as per new design