Fixed Proximity Support
Removed Debug Messages