Correct versions
Added helpers