work in progress update - JM