Proposed changes, copied from Calibrae Team Project Board