Modifing the stuff, but I have a bug now….