Updated version 2_1