Updated Various Parts