Updated due to Intrusive detail changes.