Major performance upgrade soon