More optimizations. Still have an issue.