updated for Evolution 1.0.15