Merging work on demos with textures.