removed vi_ify, added Calvin :D