Temp commit
Fixed schedulers and concurrent call wrappers