no more functional, but a little less ugly