0.0.24 speed up session building and attachment