More wasting time tuning looks
Minor tweaks in names