David Leal

Some efficiency improvements