ticket:1 Fixed requirements