few changes applied