Add changes in order to adhere to new design. Injections work!