Changing my and Rodrigo functions.