Revision to #9, still needs validation testing