Modified sample project