<DE2> For last merge, forgot to uncomment stuff