Rewrite based on Lorenzo comments