Merged Sam's project with mine