Added a few parts