Gallery 3.3

temp commit