Changes requested by Guilherme Krzisch