changes from calculon