Merged files from previous tutorials