Added some more vi hapiness