Changed things that might break it