Pulled in original proposal stuff