Timespan params and moving some code around