merged Sean's additions and added McDiverts