changed from individual keys to arrays