With some changes in place