Added some more parts