feedback from @jaredkerim