seems ok now