Added some more sense into everything