Sandrus/complete version