New version with groups add, delete when finist.