Eluna reimplement lock and improve hook handling
Eluna edit override back to OVERRIDE