Just adding a version number and making a single if out of two

Signed-off-by: Graham Chiu <compkarori@gmail.com>