Made sample a bit better