Also, you should merge this stuff with the latest version