Reworked substance and a little bit of material in preperation for an upcoming change