after 1.0 merge