Callbacks implemented but needs cleaning