added power switches, moving things around