more work on prefab system