Step towards Update 1.1.1