Decid code still needs fixing