Updated with automation solution

needs moving into main solution at some point.