Final2

Found bug in final. Need to fix.