Changes for in line editing and accessories