Fixes issue with GD instantiation on read
Improves demo