extract method and calling for specific version
guard clause added