Fixed the mess (hopefully)