generally looks ok now