More Rodrigo's changes