Update 2 cases to make it simpler