Updated code for 20 apr