still fixing group statements