Not sure I like how this was done...I think you should do it differently.  It doesn't meet the requirements of user story X (issue #6)