Merge branch 'hardcode'