snippets revised
trig revised