Returning the Joel's changes