Added several samples and so on