updated partly