Optimized to speed it up :)

Optimized to speed it up :)