New version (changed users which doesn't show up in git)
Fixing up some errors that appeared in log