Changes after testing