Let's make it more fancy