#15 Cleaned up code and allow larger connection area