sync'd with epatches