merge Danny's changes