Updated version [1.2]