Added some extra parts