Porting to new-loom