Commit before modifications post-discussion with K
First full version