Sns improvements