changed to be synchronous
fix copy paste errors