added some of the functionality they want