v1.7e finally