gc - renaming some stuff
gc - fixing stupid merge conflict in demo steps text file