re-adding nuams specific stuff