more refactor
updated min versions