work in progress modifications for GRS, doesn't compile yet