Added more variables and calculations results