Much more transaction support cleaned up join transaction