Moved(/re-added) the number of days field
Tidying code (let the arguments begin)