updated with last small review