Add small changes according to meeting on 21th aug 2013