rename Constants
extend cursor handling