updated with Class