change names; add temp class