Last commit, contains some improvements and explanation