Some requested changes