updated to work with latest æsh api changes