Changing patching system. Buggy revision!!!
First merge