first commit of 2.5 stack