got rid of most of the "proposed"