added some more handles