Added the value calcs