changed to manual callbacks with ids
0.0.4