Removed Debug Code, Tuned Parameter