updated and renamed everything