* Made the small changes to bypass the double association system
  for now