some changes applied.