rework api
Initial Target