Added Check over/under flow