filled in a couple of functions -MM