A better way of making this work.