Added gpe flag to control envelope composition
more of the above