Streamlined a few critical methods.