started converting from a.thieriot's to my own