Make back into single script for VIM