instead of duplicating? should we move to a helper or something?