taken out some uneeded lines I added earlier