deleted connect and modified