Add some logic