Eluna some hook changes