Go back to more direct setup