update for GE2/1 + fix