added some more functionality