Final changes before adding some animation.