Added some stuff to improve performance