0512's version

the version that has been sent to GJ and Ivo for the first time.