resaving from master repo v 1.7f