updated all references and copyright