update for version 1.8 final