added back missing features like bad data link