Revved version after quick check of NF's changes