dev add some logic