Added hooks for programming mode