Adjust project with Rodrigo's changes