moved to Wh and restructured some