Samantha v2 [server-aware, to be tested]