Ok - I made that change. Still need to understand the click assigning before this is fully working