Improve groups sample