Re-stabalized synchronous get
removed unwanted so
Fixed conflicts