Merged other sample project with this