not sure whats happening, complete overhaul