SAMUEL-613 still 2