To much code, Slimed it down a bit