zd adding other acceptance criteria, fix bug