Changes solving Connectivity and Excptions Issues