Improved Stair Logic