upgrading to latest versions and some commenting