Added a few more parts