Update in response to feedback from @astrofrog