Hopefully making it easier to implement step 4.