Working on decision logic