Changes for my first possible solution, it looks ok so far