updates - continuing refactoring ...