New mix sync

sync noobee/new_mix to john-rb/new_mix