I changed some stuff (feel free to copy)