Finalized GetSafeDrinkDirection and reverted battery/supply code