cohesion added, removed hostfaking as a way of fixing CORS