updated to former wiki version