fixed surfaces.. again