#36 edited group view