updated with button group