Minor adjustment after testing 2