fixed this up