2 basic changes

plz find patches enclosed