changes to helper and