Fix callbacks and simplify