Changed limit to 60.
added group validation to client