Slight rearrangement of how textures are used