last commit before merging evolution logic