some more jo chnages