Changes to Join method which need to be merged