jmelvin - updated scripts for my taste