Todd's changes...again - o -