more prefab changes