Good idea adding it to TahoeActivity