cleanup, add update/reset methods