Tested with old scene, just need to add tag to fix