Finals design commit 1