major overhaul
overwrote something