AD Class updates

-shape and trigger/hold function