Slightly better but sketchy preloading fix