Most of work done updating code