Changing things to allow at-runtime piece creation