Reworked in the context of the above.