some minor changes to notation