Making a better one of these.