Made a few things harder