Minor changes
Changes... for better performance
Changes... for better performance