Added tracking and final cost - double click to edit