Added plastic, fixed merge conflicts.