v 1.7 - version *** improved