We need a better way to do this -______-