Updated Constructor and toDisk