added calc that you can cause errors in on demand