fixing revert -

accidentally reverted and lost Nick's changes. Re-added.