a little less hardcoding