Modified code

Change-Id: Icffb5dd99d80d18e417d0757ba7494dace95bf6e