Updated Parts with new fix from omgnull