Adding new logic
More changes
Last commit
Merging core 6.1