Some ideas
Small rework