Another redraw ((not too fond of this one but it’s not so bad))