It's working!
Slightly more optimized code