changed join to work properly

I hope