groups done - revised