removing 2.0 stuff and adding 3.0 concept and implementation