merge with vicent code