Some updates according last feedback