Structure change
Fix despawning