merge Dan's tutorials