merged in henry's changes