Final changes

thanks Walter