Updated revision to 1.7-upgrade