#33 modify and disconnect forms added