changed functions so they match up