Proposed changes in the Calibrae fork