v1.7a Updated

final after merge