user story im-12 resolved