Changes done by dev 103