Major performance upgrade