Evan's Changes

By request adopting Evan's changes.  look awesome