major api and clone changes