Updated :number to :to and :from in data