Started changing the load function