Final version (1.1)