Got rid of surfaces, surface detection from below
Resolving merge conflicts