try a new branch (exceptions)
some changes