most recent changes, diff for castor