Improved: Sample project