Replay last pull requests that I fore pushed away. Sorry.