Final changes from DC, end of laptop