Finally settled on a scheme after some repaints