edit to final2