New and improved. This is exactly what I was going for.