Added disconnect function and testing of user modifications