Home Update, getting Tom's changes back

Lost somewhere along the way.