Revision based on @jgraham new review