Phase2 he25

Pawel's HE Rebuild option