Fixed triana stuff