added yannis comments
added stas comments