enhancements done with pairing with Oren