Performance improvements once again