[@Lady Amalthea]

Done the changes, hope it is good this way