Couple of alterations