Added 20 minute check, now doing map key for market