move ExpDate parsing logic in the change block