added esop-submitted branch