fixed loading issue, but running into a bug.