some changes applied