solid effort to fix inconsistent loading
added more things -_-