Improved performance
Improved performance
Changes on GUI