Nimisha/split converge api

but it's Ok to merge like this.