add exceptions
master update