first version of bodo
merged