#27: Updated for performance issues.