Found out that I could do more. So this is just a paint commit.