change names and create helper