Added trinidad support - but it doesn't work