Final changes to get this working right.