In progress. Exception has been added