seth's changes to make this work