Default adjusted
Exception added