ticket:5 corrections according to remarks