changed according to CR comments