changed to dictionary