changes after syncing with epatches