added back the other pieces.