Added last comments from Joel