Updates and more samples