Updates for performance reasons!