Another modification, final_1