Version input draft, better helpers