final_2 after minor fixes