My Updated code