phase 1 change the call and dispose entry points.