Commiting final with some modification