Kostas's review feedback