Should this really be done here?