#14 Cleaned up code and allowed more connection area