Added changeset25 and 25a