FIXED the entire thing