This pre-PR commit will optimize stopping sounds