ticket:5 Fixed requirements