New version. I also removed some patch that didn't seem to be needed.
Created attachment 4561 [details] updated sketch