cleaned up join method a little