Update for better performance