Closer to ideal

Closer to ideal