Updated to match outcomes of latest discussions