Changed to use current version instead of legacy