added power supplies
cleaned up redundant parts