Added better performance