less hardcoding, slightly