Better-than-i-was

@bingler hello!