overhaul, integrated sonata user and groups