Update according to customer's feedback on 2014-11-10