Change to work with new spanish methods