changed output to dictionary etc