adding wants and has, tweaking look