spk121 Add some version conditionals