Get sample project working more smoothly