[GEAR] enhancements