Sample project improved