0.7 Revised version