separation of 1.0 and 2.0 code