Updated with same changes I just made to the post version