Updates from ivan