[afp]added feature logic