add pauls improvements