Small changes #2