Do we have a better way to do this?