adding... some logic, presumably.
merging changes