Major Change from Rick

Thanks Rick, this is great!