Performance enhancements. Go Team Topaz.