Fixed Barak's merge conflicts.