Solution suggested by Grant for making ourselves less liable to frontend changes