Updated to new texture handling