cleaned up code, broke slabs again