rearranging and add support for GRFDESCRIBE