Changes according to review17_10_13