Small amends, need to rewrite all positions :(