applied the first 40% of Mirja's comments