more changes from sage