This will be cleaned up and renamed for pre3.