compute final now
mixed finished
Merge branch 'coding'