Performance updates + pages another try