updated with power supply (again)