Modified all files and created 2 exceptions