Updated loading functionality to expected production behaviour