After rolling back to fix expressions