added joins back