Added finess test and modded registration