Yes, I might add that I supposed this was the way your deduction went - and I might add that you chose a right course in the separate cases, but unfortunately, you have yet to find some answer which fits with all the parts of the riddle
This riddle is still far from solving - so everyone who happens to come by is welcome to try his skills