First revision with documentation