Changed everything to sync calls