Changes after 2nd testing