Updates for performance and things