alleviate some code creep