Put the new settings in the surface and user boundary class and reduce
lines of code