Updates for improved vim flow