Modified to add group edit