Final version v 2.0