added feature A changes