Specification is changed plus partial implementation