The first version after the fork from Nir's repository