Revamped to use Vundle