Merge branch 'cindy/secondHood'