Further changes to the code.