small modifications
last 718 version