ver 1.0.7 in prgress