Change title
Change more logic