Go back to previous way that should work