Version 2.0 merge