Improved gallery model