Streamlined for 1.0