added calc and 26