Made it less broken