Added Steves changes and debugged