Code changes as per requirement