Tip modifier

Same as peer4commit#34 with a few fixes.