small changes, compressed, inlined