more changes from the outside dev, but still not quite right