Upgraded to 1.8.1 versions