some changes after conversation with customer