Second part of the previous commit