Added fixes version3.