plus some other change things