Switches over to non-standalone version