Added some power management