Hopefully made everything work