update to be closer to r0man