updated for 0.86
updated for 0.88