added v 1.8