done with fixes v4