Adapted to new orgmode