Updated to use generic object functions, and fixed up renumbering of questions