Another update to the first PR