made more readable, still not pixel perfect