update to manfredo-branch