Both
http://www.amazon.com/gp/product/0827602529/sr=8-7/qid=1344282389/ref=olp_product_details?ie=UTF8&me=&qid=1344282389&seller=&sr=8-7
This is the JPS Tanakh: The Holy Scriptures, The New JPS Translation According to the Traditional Hebrew Text [Hardcover]
I have the older version but it’s the best if you want the Masoretic Text translation.