Bigger changes

See the post for details.