Works somewhat better.... still in progress