Update code; still need to update tutorial to match