Update to latest master + JOIN