Amanda and Rodrigo's changes