started working on the callback
fix conflict
improved the callback call
small style amends