Add veribals & calculation