Added some effin stuff!