changed to dict