updated all code to version 2.2