changes
seg failts fixed