Updated to version 2.2