I've updated the OP, take a look.