more work on calc