Revised proposal + typos