working on resolving issues with surface