CHANGES: load function updated