Re work as per doc on 08-10-2014