Full update for my old master of whispers concept