Added parameters to userstories #8 and #23