adding mohit changes to aprit's branch