updated for Elastica master changes