Switching to SW surface for now