Group option overhaul