more work on marketplace