Second part of previous commit