update to reflect load...Temporarily refactoring