Updated with changes from future changes list