Tweaked Customer to match current app