I changed a couple of code