Add back in Danny's changes