Merged frankies stuff with the audio manager