Working on updates per Ed email