Priority 1,2 update on Final Version