fixed but still not quite right...