commit to work on rich joins

hope it works :)