Now understands JOIN and PART