CHANGED: Optimized behavior during beaming