S00: More conincent surfaces

Change-Id: I63137353c3ee2fb26845b9a2ed7f24b12820f708