Added some more hardware stuff