Final polish. It may not be useful after all