Another approach to fix the problem. Still wrong but is it going better?