MAKE done, tested and add new exceptions