BalajiN | #49 | Replacing complicated wrapper logic with lazy evaluation