Feature/improvinf part1