more 18,03 changes