updated to new Sashimi API