Some stuff reversed on demand of Reto