Incorporated Joel's changes