changed the helper class