Merged Hw2 skeleton with Original