re#2 bringing updated function list (no $this) over from the guides.