routine - attempting to merge with richmon's branch after commit