update 1.9 9/5 - code cleaned