closer, but still quite ugly