upgraded to 2.5.1
checkpoint refactoring + initial work for stack items by group