Huge changes to remove all sync call