Fixed memory usage
Started on groups