Proper Battery Resolution
Fix Agent Mishandling Env