adding if name, etc