aligned version at the code with the milestone at github