Included Daniel Baggio's suggestion

Improved Performance!