added back 3pp as a redirect, removed moon and mars