added some exits