added groups still bugged