updated - fix elpa support