add patches and change few thigs