changed galaxy model to use the new join table