I think these will work, as stated in above comment in legacy.py. lert's chat if you disagree.