Final part of improvements for 268