Modified the components to be more reliable to do their jobs the first time.