implementing as per wireframes