adjusted order to allow gb