modified OLLO lib