removing two lines that break EVERYTHING