Some additional niceness