modified and deleted some patches