Changed to generic values