Couple of changes