Pull request... the right direction

11/12