Changes after 3rd testing