Add some logic
Change logic