added some additional cases