Task #5611312717292; Updated code