helpers added but need modifications