removed logic so we can restructure it