+ first, private commit of the working code