Revised according to Tobie's comments