change request & fix bug