#8 solved issues around criteria