More updating

Needs more debugging.