now works with both concert and non-concert situations