a few less hardcoded things