fixed up james work