added some more leniencies