Merged in Pinar's text