improved some more