Final estimate

2 interface tweaks for final estimate